Replying to "git ! [rejected] & Automatic merge failed; fix conflicts and then commit the result"
Discard
Compose Show Preview